Merge branch 'doc-include' of https://github.com/huonw/cargo into doc-include
authorAlex Crichton <alex@alexcrichton.com>
Wed, 29 Apr 2015 18:23:01 +0000 (11:23 -0700)
committerAlex Crichton <alex@alexcrichton.com>
Wed, 29 Apr 2015 18:23:01 +0000 (11:23 -0700)
1  2 
src/doc/manifest.md

Simple merge